From: Eli Zaretskii Date: Fri, 20 Aug 2010 20:26:12 +0000 (+0300) Subject: Fix the MSDOS build broken by the ImageMagick support. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6897^2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=58f78f4d498134da10432139ef6dcb5a90b09eb5;p=emacs.git Fix the MSDOS build broken by the ImageMagick support. sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty. --- diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 903ec64a038..816e084d6cc 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-08-20 Eli Zaretskii + + * sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty. + 2010-08-15 Eli Zaretskii * mainmake.v2 (version): Update due to change in emacs.c. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 4be1bccefdf..e9dfc9dea3d 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -88,6 +88,8 @@ s/\.h\.in/.h-in/ /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// +/^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@// +/^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/